Enable SSL support. (#451070, Vince Busam)

2007-06-29  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackend/cups/gtkcupsutils.c (_post_check):
        (_get_check): Enable SSL support.  (#451070, Vince Busam)

svn path=/trunk/; revision=18293

diff --git a/ChangeLog b/ChangeLog
index b7d8e78c401ef142341ebfdb511001d3573966df..ac28a7a45ad4f19f12a31015d18656dfe2f765f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/printbackend/cups/gtkcupsutils.c (_post_check):
+       (_get_check): Enable SSL support.  (#451070, Vince Busam)
+
 2007-06-29  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtkbuilder.c: (gtk_builder_finalize),

diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c
index d5a6bab012fc68b9e97a0d940247d9d9febdf0b8..faf369347ab9a73287ab48d1fc3abaaa9cf5dfe2 100644 (file)
--- a/modules/printbackends/cups/gtkcupsutils.c
+++ b/modules/printbackends/cups/gtkcupsutils.c
@@ -847,13 +847,14 @@ _post_check (GtkCupsRequest *request)
           return;
         }
     }
-/* TODO: detect ssl in configure.ac */
-#if HAVE_SSL
   else if (http_status == HTTP_UPGRADE_REQUIRED)
     {
       /* Flush any error message... */
       httpFlush (request->http);
 
+      cupsSetEncryption (HTTP_ENCRYPT_REQUIRED);
+      request->state = GTK_CUPS_POST_CONNECT;
+
       /* Reconnect... */
       httpReconnect (request->http);
 
@@ -863,7 +864,6 @@ _post_check (GtkCupsRequest *request)
       request->attempts++;
       goto again;
     }
-#endif 
   else if (http_status != HTTP_OK)
     {
       int http_errno;
@@ -1035,13 +1035,14 @@ _get_check (GtkCupsRequest *request)
                                  "Can't prompt for authorization");
       return;
     }
-/* TODO: detect ssl in configure.ac */
-#if HAVE_SSL
   else if (http_status == HTTP_UPGRADE_REQUIRED)
     {
       /* Flush any error message... */
       httpFlush (request->http);
 
+      cupsSetEncryption (HTTP_ENCRYPT_REQUIRED);
+      request->state = GTK_CUPS_POST_CONNECT;
+
       /* Reconnect... */
       httpReconnect (request->http);
 
@@ -1051,7 +1052,6 @@ _get_check (GtkCupsRequest *request)
       request->attempts++;
       goto again;
     }
-#endif
   else if (http_status != HTTP_OK)
     {
       int http_errno;